Drop support for OLD_MODULES_BASE_PATH

GTK+ 4 only supports modules in the multiarch location.

diff --git a/debian/changelog b/debian/changelog
index b2858b166886bfe578443b037003ec6ae14229a1..09052ee4c59aa0db5823b157abf79739e792b3de 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,8 @@ gtk+4.0 (3.94.0-1) UNRELEASED; urgency=medium
     - Mark them as flaky for now
   * Disable GStreamer video support for now
   * Stop installing gtk4-query-immodules, superseded by gio-querymodules
+  * Drop support for OLD_MODULES_BASE_PATH. GTK+ 4 only supports modules
+    in the multiarch location.
 
  -- Jeremy Bicha <jbicha@debian.org>  Fri, 19 Jan 2018 22:05:35 -0500
 

diff --git a/debian/libgtk-4-0.postinst.in b/debian/libgtk-4-0.postinst.in
index d2ca813e82bb1e9aaf3f6ff697455e68046874cd..fd8b9425779ada005aa82ddb0a85685dd812ecaa 100644 (file)
--- a/debian/libgtk-4-0.postinst.in
+++ b/debian/libgtk-4-0.postinst.in
@@ -2,7 +2,6 @@
 set -e
 
 IMMODULES_DIR=/@MODULES_BASE_PATH@/immodules
-IMMODULES_DIR_OLD=/@OLD_MODULES_BASE_PATH@/immodules
 
 if [ "$1" = triggered ]; then
     # This is triggered everytime an application installs a
@@ -14,7 +13,7 @@ fi
 #DEBHELPER#
 
 # Also handle the initial installation
-if [ -d $IMMODULES_DIR ] || [ -d $IMMODULES_DIR_OLD ]; then
+if [ -d $IMMODULES_DIR ]; then
      /@LIBDIR@/@SHARED_PKG@/gtk4-query-immodules --update-cache || true
 fi
 

diff --git a/debian/libgtk-4-0.triggers.in b/debian/libgtk-4-0.triggers.in
index 85a23ca09712c4b9239142d493b4624bffa98778..d40b55b059aa7049ea893efaec8366a4053f7d76 100644 (file)
--- a/debian/libgtk-4-0.triggers.in
+++ b/debian/libgtk-4-0.triggers.in
@@ -1,2 +1 @@
 interest-noawait /@MODULES_BASE_PATH@/immodules
-interest-noawait /@OLD_MODULES_BASE_PATH@/immodules

diff --git a/debian/rules b/debian/rules
index 2f0bef022564e10b1da0545fcb939ea59d53dde7..51fc653ff30e9337753892828dbf6f9545103669 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,6 @@ CONFDIR := etc/gtk-4.0
 
 # relative base directory for all types of modules
 MODULES_BASE_PATH := $(LIBDIR)/gtk-4.0/$(GTK_BINARY_VERSION)
-OLD_MODULES_BASE_PATH := usr/lib/gtk-4.0/$(GTK_BINARY_VERSION)
 
 # package names
 SHARED_PKG := libgtk-$(APIVER)-$(SONAME)
@@ -84,7 +83,6 @@ debian/%: debian/%.in
                -e "s#@LIBDIR@#$(LIBDIR)#g" \
                -e 's#@CONFDIR@#$(CONFDIR)#g' \
                -e "s#@MODULES_BASE_PATH@#$(MODULES_BASE_PATH)#g" \
-               -e "s#@OLD_MODULES_BASE_PATH@#$(OLD_MODULES_BASE_PATH)#g" \
                -e "s#@NEWS@#$(NEWS)#g" \
                -e "s#@README.md@#$(README.md)#g" \
                $@.in > $@